From 9a65fc2428e9452c920a650fcb0618dc40206781 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 26 Apr 2026 16:18:32 +0200
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 596676 -> 597395 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index c3555930fe9..0e1a2ec9c72 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -924,7 +924,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	odk_settings \
 	odk_settings_generated \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 	) \
 	odk_scripts \
diff --git a/configure.ac b/configure.ac
index 7d44ed1cf3a595081402f08d20bfc596772f434a..ae317dd023e63ff83a7fb45b131ce277bf1d0c72 100644
GIT binary patch
delta 664
zcmaKo&ui0Q7{__rJnfsL=@`=`U4^|J0e`S=Im}C;YPX5nfknFQ;FxV(Q?1UXlGGt8
z=xK-t!GO=v%6bz#h}wgPq39nl*kL#ncJ-imm+70V#UBR)-@I?$_xt%iPoDR$bnlIR
z_a(90ip2P{aK*e~R_vum4+e4j7>UJJYVPH9_YnJAWGLGE_^?I}8hLIHKp$otY+keK
zuIbk7`WQ>6ecEoiy#Q9hmPQ8k!t@OLFL~B>y*s-}YFDnZCDXBR{58=NbB=k*$^@16
zqI<dc{RtVs@){W!4w_jU9o_pIzkaFPaQ3F<EUuQ@ge$}q?v&fYxoW>vH!m(*C0=TT
zrLwGU<IZ_{1RGx?6hBEYql&dEb1lbZBl@3tNYu~)G-Q~-`w)%e_%|Vrw`I^UvjWQF
zlT^T`GNil{nt<<Q7{-jo{TFsX!k;oE@zxe)cr*qoHrAmJ8%CJoLJSPt+MufUaFXKg
zHaQ&N>mNfD$3#$YlN&rENl{QBg<sx=Ra8`<IH5oqtM@?j3dbp4S0Ibee+U#CA_(|G
zf&Hh0vGG^6CW*{ib}UI0S+nj~F3acUbJK+>e$Fp_A7288zyI4(t>I?{hP2-!>B47<
vr}8|*ABvj#myvQ)rQ+OVarRKxjT@cFK5R+Qx0;9pSA;9dMLUVO_$>AdW75iX

delta 236
zcmWN?JxfAi0ES^ap68tRoP0mjpv)koGngQ#1Pv8vABYY$1TBS2Aa42-nsN?@2O1+>
znu1IyXliH(YU&p>NRurMLDV~3_dR%so<`B>ZLE9MH^Z3aSn;tLx?62_D~Q<p^aOu1
zB4l;yuJA`9&9%R{WLjdC7XjvZB5mFRq<Ai|$Qy|z?tQtlEPf#5w?vjlbwA6p!W^pw
zN3o?)=H0WKq+Z7|&8{Q(8bWfaP-0#q$Bh|ib~K87fAI}R8k?$FJFM;OZ#NF=O*`h!
g!~!1;0v;P=czN%o*s4JHCkB>h`IZ<@OmLm}2P|z#+W-In

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 0966fa57746..fdf35505023 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(gb_CustomTarget_workdir)/odk/check/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated)
 ifneq ($(gb_SUPPRESS_TESTS),)
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index d30c7164776..500348a7ea6 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,8 +43,10 @@ endif
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 	GeneratedPackage_uno_loader_classes \
 ))
 endif
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 8c1728671d9..405d84a72db 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -181,7 +181,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.39.5